From 7d90cd9f9ac6b95c867aaf7d93152821d071cd3a Mon Sep 17 00:00:00 2001 From: Robert Lipe Date: Sun, 26 Nov 2017 18:57:11 -0600 Subject: [PATCH] Try to make #includes consistently ordered. --- alan.cc | 2 +- alan.cc.note | 0 an1.cc | 4 +- an1.cc.note | 2 + arcdist.cc | 6 +- arcdist.cc.note | 0 bcr.cc | 8 +- bcr.cc.note | 0 bend.cc | 2 +- bend.cc.note | 0 brauniger_iq.cc | 2 +- brauniger_iq.cc.note | 0 build2.xml_ | 102 +++++++++ bushnell.cc | 2 +- bushnell.cc.note | 0 bushnell_trl.cc.note | 0 cet.cc.note | 1 + cet_util.cc | 2 +- cet_util.cc.note | 0 compegps.cc.note | 0 coverity_model.cc.note | 4 + cst.cc | 4 +- cst.cc.note | 4 + csv_util.cc | 8 +- csv_util.cc.note | 4 + csv_util.h | 2 + delgpl.cc.note | 4 + destinator.cc.note | 4 + dg-100.cc | 8 +- dg-100.cc.note | 4 + discard.cc | 6 +- discard.cc.note | 4 + dmtlog.cc.note | 4 + duplicate.cc | 4 +- duplicate.cc.note | 4 + easygps.cc | 2 +- easygps.cc.note | 4 + energympro.cc | 2 +- energympro.cc.note | 4 + enigma.cc | 4 +- enigma.cc.note | 4 + exif.cc | 6 +- exif.cc.note | 4 + explorist_ini.cc | 2 +- explorist_ini.cc.note | 4 + f90g_track.cc.note | 4 + fatal.cc | 4 +- fatal.cc.note | 4 + filter_skeleton.cc.note | 4 + filter_vecs.cc | 8 +- filter_vecs.cc.note | 4 + format_skeleton.cc.note | 4 + formspec.cc.note | 4 + g7towin.cc | 6 +- g7towin.cc.note | 4 + garmin.cc | 16 +- garmin.cc.note | 4 + garmin_device_xml.cc | 4 +- garmin_device_xml.cc.note | 4 + garmin_fit.cc | 2 +- garmin_fit.cc.note | 4 + garmin_fs.cc | 4 +- garmin_fs.cc.note | 4 + garmin_gpi.cc | 4 +- garmin_gpi.cc.note | 4 + garmin_tables.cc | 4 +- garmin_tables.cc.note | 4 + garmin_txt.cc.note | 4 + garmin_xt.cc | 2 +- garmin_xt.cc.note | 4 + gbfile.cc | 6 +- gbfile.cc.note | 4 + gbser.cc | 6 +- gbser.cc.note | 4 + gbser_posix.cc | 8 +- gbser_posix.cc.note | 4 + gbser_win.cc.note | 4 + gbsleep.cc.note | 4 + gdb.cc | 2 +- gdb.cc.note | 4 + geo.cc | 4 +- geo.cc.note | 4 + geojson.cc | 4 +- geojson.cc.note | 5 + ggv_bin.cc.note | 4 + ggv_log.cc | 8 +- ggv_log.cc.note | 4 + ggv_ovl.cc | 6 +- ggv_ovl.cc.note | 4 + globals.cc.note | 4 + globalsat_sport.cc | 6 +- globalsat_sport.cc.note | 4 + glogbook.cc | 2 +- glogbook.cc.note | 4 + gnav_trl.cc.note | 4 + googledir.cc.note | 4 + gopal.cc | 8 +- gopal.cc.note | 4 + gpssim.cc | 6 +- gpssim.cc.note | 4 + gpsutil.cc | 4 +- gpsutil.cc.note | 4 + gpx.cc | 8 +- gpx.cc.note | 4 + grtcirc.cc | 6 +- grtcirc.cc.note | 4 + gtm.cc.note | 4 + gtrnctr.cc | 2 +- gtrnctr.cc.note | 4 + gui/.qmake.stash | 42 ++++ gui/app.pro.user | 216 ++++++++++++++++++ gui/dpencode.cc | 4 +- gui/latlng.cc | 2 +- height.cc | 4 +- height.cc.note | 4 + hiketech.cc | 4 +- hiketech.cc.note | 4 + holux.cc | 4 +- holux.cc.note | 4 + html.cc | 4 +- html.cc.note | 4 + humminbird.cc | 4 +- humminbird.cc.note | 4 + igc.cc | 8 +- igc.cc.note | 4 + ignrando.cc | 2 +- ignrando.cc.note | 4 + igo8.cc | 2 +- igo8.cc.note | 4 + ik3d.cc.note | 4 + inifile.cc | 4 +- inifile.cc.note | 4 + internal_styles.cc.note | 4 + interpolate.cc | 2 +- interpolate.cc.note | 4 + itracku.cc | 6 +- itracku.cc.note | 4 + jeeps/garminusb.h | 1 + jeeps/gps.h | 8 +- jeeps/gpsapp.cc | 12 +- jeeps/gpscom.cc | 7 +- jeeps/gpsdevice_ser.cc | 2 +- jeeps/gpsdevice_usb.cc | 4 +- jeeps/gpsfmt.cc | 46 ++-- jeeps/gpsinput.cc | 8 +- jeeps/gpslibusb.cc | 6 +- jeeps/gpsmath.cc | 6 +- jeeps/gpsmem.cc | 8 +- jeeps/gpsproj.cc | 4 +- jeeps/gpsprot.cc | 2 +- jeeps/gpsread.cc | 10 +- jeeps/gpssend.cc | 10 +- jeeps/gpsserial.cc | 12 +- jeeps/gpsusbread.cc | 4 +- jeeps/gpsusbsend.cc | 4 +- jeeps/gpsusbwin.cc | 12 +- jeeps/jgpsutil.cc | 4 +- jogmap.cc.note | 4 + jtr.cc | 4 +- jtr.cc.note | 4 + kml.cc | 8 +- kml.cc.note | 4 + lmx.cc | 2 +- lowranceusr.cc | 4 +- lowranceusr4.cc | 8 +- maggeo.cc | 6 +- magproto.cc | 12 +- main.cc | 14 +- mapasia.cc | 8 +- mapfactor.cc | 2 +- mapsend.cc | 6 +- mapsource.cc | 4 +- mkicondoc.cc | 4 +- mkshort.cc | 8 +- mmo.cc | 6 +- mtk_locus.cc | 6 +- mtk_logger.cc | 8 +- navicache.cc | 2 +- naviguide.cc | 2 +- netstumbler.cc | 6 +- nmea.cc | 10 +- nmn4.cc | 8 +- ozi.cc | 6 +- parse.cc | 6 +- pcx.cc | 8 +- pocketfms_wp.cc | 4 +- polygon.cc | 2 +- position.cc | 4 +- psitrex.cc | 6 +- queue.cc | 2 +- radius.cc | 4 +- random.cc | 4 +- raymarine.cc | 6 +- rgbcolors.cc | 2 +- route.cc | 2 +- saroute.cc | 2 +- shape.cc | 2 +- skyforce.cc | 6 +- skytraq.cc | 6 +- smplrout.cc | 2 +- sort.cc | 2 +- stackfilter.cc | 2 +- subrip.cc | 2 +- text.cc | 4 +- tiger.cc | 6 +- tmpro.cc | 2 +- tomtom.cc | 4 +- tpo.cc | 6 +- trackfilter.cc | 4 +- transform.cc | 2 +- util.cc | 18 +- v900.cc | 6 +- validate.cc | 2 +- vcf.cc | 6 +- vecs.cc | 6 +- vidaone.cc | 4 +- vitosmt.cc | 2 +- vpl.cc | 2 +- waypt.cc | 6 +- wbt-200.cc | 4 +- wfff_xml.cc | 2 +- xcsv.cc | 6 +- .../options/skytraq-bin-gps_utc_offset.xml | 1 + xmlgeneric.cc | 2 +- xmltag.cc | 6 +- xol.cc | 6 +- 226 files changed, 1020 insertions(+), 377 deletions(-) create mode 100644 alan.cc.note create mode 100644 an1.cc.note create mode 100644 arcdist.cc.note create mode 100644 bcr.cc.note create mode 100644 bend.cc.note create mode 100644 brauniger_iq.cc.note create mode 100644 build2.xml_ create mode 100644 bushnell.cc.note create mode 100644 bushnell_trl.cc.note create mode 100644 cet.cc.note create mode 100644 cet_util.cc.note create mode 100644 compegps.cc.note create mode 100644 coverity_model.cc.note create mode 100644 cst.cc.note create mode 100644 csv_util.cc.note create mode 100644 delgpl.cc.note create mode 100644 destinator.cc.note create mode 100644 dg-100.cc.note create mode 100644 discard.cc.note create mode 100644 dmtlog.cc.note create mode 100644 duplicate.cc.note create mode 100644 easygps.cc.note create mode 100644 energympro.cc.note create mode 100644 enigma.cc.note create mode 100644 exif.cc.note create mode 100644 explorist_ini.cc.note create mode 100644 f90g_track.cc.note create mode 100644 fatal.cc.note create mode 100644 filter_skeleton.cc.note create mode 100644 filter_vecs.cc.note create mode 100644 format_skeleton.cc.note create mode 100644 formspec.cc.note create mode 100644 g7towin.cc.note create mode 100644 garmin.cc.note create mode 100644 garmin_device_xml.cc.note create mode 100644 garmin_fit.cc.note create mode 100644 garmin_fs.cc.note create mode 100644 garmin_gpi.cc.note create mode 100644 garmin_tables.cc.note create mode 100644 garmin_txt.cc.note create mode 100644 garmin_xt.cc.note create mode 100644 gbfile.cc.note create mode 100644 gbser.cc.note create mode 100644 gbser_posix.cc.note create mode 100644 gbser_win.cc.note create mode 100644 gbsleep.cc.note create mode 100644 gdb.cc.note create mode 100644 geo.cc.note create mode 100644 geojson.cc.note create mode 100644 ggv_bin.cc.note create mode 100644 ggv_log.cc.note create mode 100644 ggv_ovl.cc.note create mode 100644 globals.cc.note create mode 100644 globalsat_sport.cc.note create mode 100644 glogbook.cc.note create mode 100644 gnav_trl.cc.note create mode 100644 googledir.cc.note create mode 100644 gopal.cc.note create mode 100644 gpssim.cc.note create mode 100644 gpsutil.cc.note create mode 100644 gpx.cc.note create mode 100644 grtcirc.cc.note create mode 100644 gtm.cc.note create mode 100644 gtrnctr.cc.note create mode 100644 gui/.qmake.stash create mode 100644 gui/app.pro.user create mode 100644 height.cc.note create mode 100644 hiketech.cc.note create mode 100644 holux.cc.note create mode 100644 html.cc.note create mode 100644 humminbird.cc.note create mode 100644 igc.cc.note create mode 100644 ignrando.cc.note create mode 100644 igo8.cc.note create mode 100644 ik3d.cc.note create mode 100644 inifile.cc.note create mode 100644 internal_styles.cc.note create mode 100644 interpolate.cc.note create mode 100644 itracku.cc.note create mode 100644 jogmap.cc.note create mode 100644 jtr.cc.note create mode 100644 kml.cc.note create mode 100644 xmldoc/formats/options/skytraq-bin-gps_utc_offset.xml diff --git a/alan.cc b/alan.cc index a23a23295..1d1c82432 100644 --- a/alan.cc +++ b/alan.cc @@ -25,7 +25,7 @@ */ #include "defs.h" -#include +#include #define MYNAME "alan" diff --git a/alan.cc.note b/alan.cc.note new file mode 100644 index 000000000..e69de29bb diff --git a/an1.cc b/an1.cc index b52ddfbc5..68314050b 100644 --- a/an1.cc +++ b/an1.cc @@ -20,8 +20,8 @@ */ #include "defs.h" -#include // atof -#include // sprintf +#include // sprintf +#include // atof #define MYNAME "an1" diff --git a/an1.cc.note b/an1.cc.note new file mode 100644 index 000000000..9da383cec --- /dev/null +++ b/an1.cc.note @@ -0,0 +1,2 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/an1.cc. diff --git a/arcdist.cc b/arcdist.cc index 81885cb72..fa6cf5381 100644 --- a/arcdist.cc +++ b/arcdist.cc @@ -24,9 +24,9 @@ #include "filterdefs.h" #include "grtcirc.h" -#include -#include -#include // strtod +#include +#include +#include // strtod #if FILTERS_ENABLED #define MYNAME "Arc filter" diff --git a/arcdist.cc.note b/arcdist.cc.note new file mode 100644 index 000000000..e69de29bb diff --git a/bcr.cc b/bcr.cc index 8cf79e6b8..0f85e06c2 100644 --- a/bcr.cc +++ b/bcr.cc @@ -27,13 +27,13 @@ */ #include "defs.h" +#include "cet_util.h" #include "csv_util.h" #include "garmin_tables.h" -#include "cet_util.h" #include "inifile.h" -#include -#include -#include +#include +#include +#include #define MYNAME "bcr" diff --git a/bcr.cc.note b/bcr.cc.note new file mode 100644 index 000000000..e69de29bb diff --git a/bend.cc b/bend.cc index 89c9d801e..6da185178 100644 --- a/bend.cc +++ b/bend.cc @@ -24,8 +24,8 @@ #include "filterdefs.h" #include "grtcirc.h" -#include #include +#include #define MYNAME "bend" diff --git a/bend.cc.note b/bend.cc.note new file mode 100644 index 000000000..e69de29bb diff --git a/brauniger_iq.cc b/brauniger_iq.cc index 049b52f81..11ffc3c40 100644 --- a/brauniger_iq.cc +++ b/brauniger_iq.cc @@ -20,7 +20,7 @@ #include "defs.h" #include "gbser.h" -#include +#include static void* serial_handle; diff --git a/brauniger_iq.cc.note b/brauniger_iq.cc.note new file mode 100644 index 000000000..e69de29bb diff --git a/build2.xml_ b/build2.xml_ new file mode 100644 index 000000000..1694c2818 --- /dev/null +++ b/build2.xml_ @@ -0,0 +1,102 @@ + + Getting or Building GPSBabel + +Downloading - the easy way + +GPSBabel is distributed "ready to run" on most common +operating systems via the +official GPSBabel download page. + + As GPSBabel runs on a wide variety of operating systems, +be sure to visit the +OS-Specific notes for +additional information. + + + +Building from source. + +Most people will not have to build GPSBabel as we provide builds for MacOS +(formerly Mac OS/X) and Windows. If you are a developer, need access to a change +that's been committed but not released, or are using an operating +system where no binary is provided, you will have to build it from +source. The source code should be compilable on any system with +ISO C++11. It's tested on Linux, MacOS and Windows cross compilers. +Less frequently, someone will build on MSVC, FreeBSD, OpenBSD, Solaris, +etc. Both Clang/LLVM and GNU C++ are regularly exercised via automation. + + + + You will need a build environment. In general, configuring that will be + custom for your computer. Some of these components may be provided with + your operating system, perhaps as optional packages, and some will have + to be downloaded. Qt +is required for all builds. Mac and Windows users can download +binaries from Qt Downloads +Fedora or CentOS users may need to 'yum install qt-devel'. Optionally, use qt5-base. When in doubt, 'yum search qt' or 'yum search qt5' can help you find the correct package name +Ubuntu users may need to 'apt-get install libqt5-core libqt5-dev'. +Qt versions 5.2 and newer are supported. + + To build the Garmin USB support, libusb +is required for Linux or other UNIX-like systems. +Fedora users find this via 'yum install libusb-devel'. Ubuntu users may +need to 'yum install libusb-dev'. We provide a modified version for MacOS. + + + + + + + The next step is to actually get the source code. The most recent and tested release, available + from the GPSBabel download page + + If you're doing any development, you'll find that working from the GPSBabel Github repo is easier and is required for sending us changes. Checkouts vis Git, HTTPS, SSH, and Subversion are supported. + + + + There are two approaches to building. Users comfortable with "old-school" UNIXy open-source development will likely prefer to run + "./configure && make". Others may prefer to use the (pretty awesome) + Qt Creator to open the .pro files and use the IDE and debugger that are + part of Qt. As a hybrid approach, you can use the Qt .pro files and build + from the command line by running "qmake && make". + +In all cases, the GUI + is built separately from the gui/directory and is buildable only via the + Qt approach. + + + + + + In most cases, the code is as simple to build as running: + + ./configure && make + +There are additional flags that can be passed to configure to + customize your build of GPSBabel. + +./configure --help + +lists all the supported options, but of interest we have: + Excludes the shapefile support. + + + Excludes all support for our something-separated formats. + + + Excludes all filter support. + + + Activate debugging mode for gpsbabel-debug. + + + dir Specifies that the doc should be created and installed in dir. + + + Disables use of libusb, even it's it's available. + + + By default, we use our own version of zlib. If you specify the system zlib is used. A value of (or --without-zlib) disables zlib. + + + diff --git a/bushnell.cc b/bushnell.cc index a2ce803c5..1cc6fb53c 100644 --- a/bushnell.cc +++ b/bushnell.cc @@ -21,8 +21,8 @@ #include "defs.h" -#include #include +#include #define MYNAME "Bushnell" static gbfile* file_in; diff --git a/bushnell.cc.note b/bushnell.cc.note new file mode 100644 index 000000000..e69de29bb diff --git a/bushnell_trl.cc.note b/bushnell_trl.cc.note new file mode 100644 index 000000000..e69de29bb diff --git a/cet.cc.note b/cet.cc.note new file mode 100644 index 000000000..fdbccf2ad --- /dev/null +++ b/cet.cc.note @@ -0,0 +1 @@ +1 warning generated. diff --git a/cet_util.cc b/cet_util.cc index b73c925dc..dd498f26c 100644 --- a/cet_util.cc +++ b/cet_util.cc @@ -22,10 +22,10 @@ #include "defs.h" #include "cet.h" #include "cet_util.h" -#include // qsort #include "src/core/logging.h" #include #include +#include // qsort #define MYNAME "cet_util" diff --git a/cet_util.cc.note b/cet_util.cc.note new file mode 100644 index 000000000..e69de29bb diff --git a/compegps.cc.note b/compegps.cc.note new file mode 100644 index 000000000..e69de29bb diff --git a/coverity_model.cc.note b/coverity_model.cc.note new file mode 100644 index 000000000..59393accc --- /dev/null +++ b/coverity_model.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +9 errors generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/coverity_model.cc. diff --git a/cst.cc b/cst.cc index c040355fb..fd920e9b0 100644 --- a/cst.cc +++ b/cst.cc @@ -22,8 +22,8 @@ #include "defs.h" #include "cet_util.h" -#include -#include +#include +#include #define MYNAME "cst" diff --git a/cst.cc.note b/cst.cc.note new file mode 100644 index 000000000..6a573f0f8 --- /dev/null +++ b/cst.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +4 warnings and 1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/cst.cc. diff --git a/csv_util.cc b/csv_util.cc index 63a48114c..0cc8a9a4f 100644 --- a/csv_util.cc +++ b/csv_util.cc @@ -23,17 +23,17 @@ #include #include -#include "defs.h" #include "csv_util.h" +#include "defs.h" #include "garmin_fs.h" #include "grtcirc.h" #include "jeeps/gpsmath.h" #include "src/core/logging.h" #include "strptime.h" -#include -#include -#include +#include +#include +#include #define MYNAME "CSV_UTIL" diff --git a/csv_util.cc.note b/csv_util.cc.note new file mode 100644 index 000000000..5053ea485 --- /dev/null +++ b/csv_util.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/csv_util.cc. diff --git a/csv_util.h b/csv_util.h index 76d963847..ea4fbc33b 100644 --- a/csv_util.h +++ b/csv_util.h @@ -18,6 +18,8 @@ */ +#include "queue.h" +#include "defs.h" #include class QTextStream; diff --git a/delgpl.cc.note b/delgpl.cc.note new file mode 100644 index 000000000..bf1f9b0ed --- /dev/null +++ b/delgpl.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/delgpl.cc. diff --git a/destinator.cc.note b/destinator.cc.note new file mode 100644 index 000000000..db6f5d568 --- /dev/null +++ b/destinator.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/destinator.cc. diff --git a/dg-100.cc b/dg-100.cc index a50b6eb86..b024a1d3b 100644 --- a/dg-100.cc +++ b/dg-100.cc @@ -29,12 +29,12 @@ */ #include "defs.h" -#include +#include #include "gbser.h" -#include -#include -#include +#include +#include +#include #define MYNAME "DG-100" diff --git a/dg-100.cc.note b/dg-100.cc.note new file mode 100644 index 000000000..8a5c06042 --- /dev/null +++ b/dg-100.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 warning and 1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/dg-100.cc. diff --git a/discard.cc b/discard.cc index 67ab920f5..f9a6717e8 100644 --- a/discard.cc +++ b/discard.cc @@ -21,11 +21,11 @@ #include "defs.h" #include "filterdefs.h" -#include +#include // Can't use QRegularExpression because Linux won't get Qt 5 for years. #include -#include -#include +#include +#include #if FILTERS_ENABLED static char* hdopopt = NULL; diff --git a/discard.cc.note b/discard.cc.note new file mode 100644 index 000000000..1a82842fc --- /dev/null +++ b/discard.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/discard.cc. diff --git a/dmtlog.cc.note b/dmtlog.cc.note new file mode 100644 index 000000000..02c414be2 --- /dev/null +++ b/dmtlog.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +3 errors generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/dmtlog.cc. diff --git a/duplicate.cc b/duplicate.cc index 780b51e37..cc707278e 100644 --- a/duplicate.cc +++ b/duplicate.cc @@ -20,8 +20,8 @@ */ #include "defs.h" #include "filterdefs.h" -#include -#include // qsort +#include +#include // qsort #if FILTERS_ENABLED static char* snopt = NULL; diff --git a/duplicate.cc.note b/duplicate.cc.note new file mode 100644 index 000000000..18b5cd7ee --- /dev/null +++ b/duplicate.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/duplicate.cc. diff --git a/easygps.cc b/easygps.cc index 82f650eb9..eac7fe56f 100644 --- a/easygps.cc +++ b/easygps.cc @@ -20,7 +20,7 @@ #include "defs.h" -#include +#include static gbfile* file_in; static gbfile* file_out; diff --git a/easygps.cc.note b/easygps.cc.note new file mode 100644 index 000000000..c38c3c6ce --- /dev/null +++ b/easygps.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/easygps.cc. diff --git a/energympro.cc b/energympro.cc index ae95de69a..54d50cfcc 100644 --- a/energympro.cc +++ b/energympro.cc @@ -22,7 +22,7 @@ #include "defs.h" #include -#include +#include #define MYNAME "energympro" diff --git a/energympro.cc.note b/energympro.cc.note new file mode 100644 index 000000000..9eb0de7c5 --- /dev/null +++ b/energympro.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/energympro.cc. diff --git a/enigma.cc b/enigma.cc index c6c00c919..f46a0dc66 100644 --- a/enigma.cc +++ b/enigma.cc @@ -22,8 +22,8 @@ */ #include "defs.h" -#include -#include +#include +#include #define MYNAME "Enigma binary route and waypoint file format" diff --git a/enigma.cc.note b/enigma.cc.note new file mode 100644 index 000000000..7614f025b --- /dev/null +++ b/enigma.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/enigma.cc. diff --git a/exif.cc b/exif.cc index 6b67a912e..5551ee856 100644 --- a/exif.cc +++ b/exif.cc @@ -31,10 +31,10 @@ #include "defs.h" #include "garmin_tables.h" #include "jeeps/gpsmath.h" -#include -#include -#include #include +#include +#include +#include #define MYNAME "exif" diff --git a/exif.cc.note b/exif.cc.note new file mode 100644 index 000000000..c916ca49d --- /dev/null +++ b/exif.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 warning and 1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/exif.cc. diff --git a/explorist_ini.cc b/explorist_ini.cc index 7c06b34d9..5e3cabde9 100644 --- a/explorist_ini.cc +++ b/explorist_ini.cc @@ -1,6 +1,6 @@ #include "defs.h" -#include "inifile.h" #include "explorist_ini.h" +#include "inifile.h" static inifile_t* inifile; static const char myname[] = "explorist"; diff --git a/explorist_ini.cc.note b/explorist_ini.cc.note new file mode 100644 index 000000000..ad9a2cfa9 --- /dev/null +++ b/explorist_ini.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/explorist_ini.cc. diff --git a/f90g_track.cc.note b/f90g_track.cc.note new file mode 100644 index 000000000..494eecf42 --- /dev/null +++ b/f90g_track.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/f90g_track.cc. diff --git a/fatal.cc b/fatal.cc index fe2da924c..9ae9702ee 100644 --- a/fatal.cc +++ b/fatal.cc @@ -20,8 +20,8 @@ */ #include "defs.h" -#include -#include +#include +#include void fatal(const char* fmt, ...) { diff --git a/fatal.cc.note b/fatal.cc.note new file mode 100644 index 000000000..35daf646f --- /dev/null +++ b/fatal.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/fatal.cc. diff --git a/filter_skeleton.cc.note b/filter_skeleton.cc.note new file mode 100644 index 000000000..46196f58e --- /dev/null +++ b/filter_skeleton.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/filter_skeleton.cc. diff --git a/filter_vecs.cc b/filter_vecs.cc index 9b14ca941..4153efae1 100644 --- a/filter_vecs.cc +++ b/filter_vecs.cc @@ -21,12 +21,12 @@ #include "defs.h" #include "filterdefs.h" -#include "inifile.h" #include "gbversion.h" +#include "inifile.h" #include -#include // qsort -#include -#include +#include +#include +#include // qsort typedef struct { filter_vecs_t* vec; diff --git a/filter_vecs.cc.note b/filter_vecs.cc.note new file mode 100644 index 000000000..43dc4a25b --- /dev/null +++ b/filter_vecs.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/filter_vecs.cc. diff --git a/format_skeleton.cc.note b/format_skeleton.cc.note new file mode 100644 index 000000000..cce9129cb --- /dev/null +++ b/format_skeleton.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +3 errors generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/format_skeleton.cc. diff --git a/formspec.cc.note b/formspec.cc.note new file mode 100644 index 000000000..02fd6e5a8 --- /dev/null +++ b/formspec.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/formspec.cc. diff --git a/g7towin.cc b/g7towin.cc index 1e0997b4f..72bf9b351 100644 --- a/g7towin.cc +++ b/g7towin.cc @@ -25,15 +25,15 @@ */ #include "defs.h" -#include "csv_util.h" #include "cet_util.h" +#include "csv_util.h" #include "garmin_fs.h" #include "garmin_tables.h" #include "jeeps/gpsmath.h" #include "strptime.h" -#include -#include +#include +#include #include #if CSVFMTS_ENABLED diff --git a/g7towin.cc.note b/g7towin.cc.note new file mode 100644 index 000000000..16f8af699 --- /dev/null +++ b/g7towin.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/g7towin.cc. diff --git a/garmin.cc b/garmin.cc index a4bcb8779..eb61bfe5b 100644 --- a/garmin.cc +++ b/garmin.cc @@ -19,19 +19,19 @@ */ -#include -#include -#include -#include +#include +#include +#include +#include -#include "defs.h" #include "cet_util.h" +#include "defs.h" +#include "garmin_device_xml.h" +#include "garmin_fs.h" +#include "garmin_tables.h" #include "grtcirc.h" #include "jeeps/gps.h" #include "jeeps/gpsserial.h" -#include "garmin_tables.h" -#include "garmin_fs.h" -#include "garmin_device_xml.h" #define MYNAME "GARMIN" static const char* portname; diff --git a/garmin.cc.note b/garmin.cc.note new file mode 100644 index 000000000..dcf1f18c7 --- /dev/null +++ b/garmin.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/garmin.cc. diff --git a/garmin_device_xml.cc b/garmin_device_xml.cc index ae4bcb6fd..8621b53ce 100644 --- a/garmin_device_xml.cc +++ b/garmin_device_xml.cc @@ -26,10 +26,10 @@ #include "defs.h" -#include "xmlgeneric.h" #include "garmin_device_xml.h" +#include "xmlgeneric.h" #include -#include +#include #define MYNAME "whatever" diff --git a/garmin_device_xml.cc.note b/garmin_device_xml.cc.note new file mode 100644 index 000000000..7e9563030 --- /dev/null +++ b/garmin_device_xml.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/garmin_device_xml.cc. diff --git a/garmin_fit.cc b/garmin_fit.cc index b3d8c027e..9c2bed37e 100644 --- a/garmin_fit.cc +++ b/garmin_fit.cc @@ -22,7 +22,7 @@ */ #include "defs.h" -#include +#include #define MYNAME "fit" diff --git a/garmin_fit.cc.note b/garmin_fit.cc.note new file mode 100644 index 000000000..bc3a32e1b --- /dev/null +++ b/garmin_fit.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +4 warnings and 1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/garmin_fit.cc. diff --git a/garmin_fs.cc b/garmin_fs.cc index dc5df1be3..e30c3e9aa 100644 --- a/garmin_fs.cc +++ b/garmin_fs.cc @@ -27,8 +27,8 @@ #include "inifile.h" #include -#include -#include +#include +#include #define MYNAME "garmin_fs" diff --git a/garmin_fs.cc.note b/garmin_fs.cc.note new file mode 100644 index 000000000..e6c9c7c93 --- /dev/null +++ b/garmin_fs.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/garmin_fs.cc. diff --git a/garmin_gpi.cc b/garmin_gpi.cc index 149c7f7da..ee1b0b5e0 100644 --- a/garmin_gpi.cc +++ b/garmin_gpi.cc @@ -46,11 +46,11 @@ #include "defs.h" #include "cet_util.h" -#include "jeeps/gpsmath.h" #include "garmin_fs.h" #include "garmin_gpi.h" -#include +#include "jeeps/gpsmath.h" #include +#include #define MYNAME "garmin_gpi" diff --git a/garmin_gpi.cc.note b/garmin_gpi.cc.note new file mode 100644 index 000000000..897a20955 --- /dev/null +++ b/garmin_gpi.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +2 errors generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/garmin_gpi.cc. diff --git a/garmin_tables.cc b/garmin_tables.cc index 4ff02daa3..78c30504b 100644 --- a/garmin_tables.cc +++ b/garmin_tables.cc @@ -21,9 +21,9 @@ */ #include "garmin_tables.h" -#include "src/core/logging.h" #include "jeeps/gpsmath.h" -#include // qsort +#include "src/core/logging.h" +#include // qsort #define MYNAME "garmin_tables" diff --git a/garmin_tables.cc.note b/garmin_tables.cc.note new file mode 100644 index 000000000..e8a3cd6cb --- /dev/null +++ b/garmin_tables.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/garmin_tables.cc. diff --git a/garmin_txt.cc.note b/garmin_txt.cc.note new file mode 100644 index 000000000..16688c936 --- /dev/null +++ b/garmin_txt.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/garmin_txt.cc. diff --git a/garmin_xt.cc b/garmin_xt.cc index 604a5c60f..6832c5147 100644 --- a/garmin_xt.cc +++ b/garmin_xt.cc @@ -24,7 +24,7 @@ */ #include "defs.h" -#include +#include #define MYNAME "Garmin_XT" #define GARMIN_XT_ELE 31500/65536 diff --git a/garmin_xt.cc.note b/garmin_xt.cc.note new file mode 100644 index 000000000..475cf6e34 --- /dev/null +++ b/garmin_xt.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +2 warnings and 1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/garmin_xt.cc. diff --git a/gbfile.cc b/gbfile.cc index 193494391..0c9302ffe 100644 --- a/gbfile.cc +++ b/gbfile.cc @@ -24,9 +24,9 @@ #include "gbfile.h" #include "src/core/logging.h" -#include -#include // for va_copy -#include +#include +#include // for va_copy +#include #if __WIN32__ /* taken from minigzip.c (part of the zlib project) */ diff --git a/gbfile.cc.note b/gbfile.cc.note new file mode 100644 index 000000000..3c8d2d4aa --- /dev/null +++ b/gbfile.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 warning and 1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/gbfile.cc. diff --git a/gbser.cc b/gbser.cc index 66b6cc46f..27749ec56 100644 --- a/gbser.cc +++ b/gbser.cc @@ -23,9 +23,9 @@ #include "gbser.h" #include "gbser_private.h" -#include -#include -#include +#include +#include +#include void gbser__db(int l, const char* msg, ...) { diff --git a/gbser.cc.note b/gbser.cc.note new file mode 100644 index 000000000..076b1b947 --- /dev/null +++ b/gbser.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/gbser.cc. diff --git a/gbser_posix.cc b/gbser_posix.cc index cab5e6660..7ad669c3d 100644 --- a/gbser_posix.cc +++ b/gbser_posix.cc @@ -23,11 +23,11 @@ #include "gbser.h" #include "gbser_private.h" -#include -#include +#include +#include +#include +#include #include -#include -#include #include #include #include diff --git a/gbser_posix.cc.note b/gbser_posix.cc.note new file mode 100644 index 000000000..7c5d6474e --- /dev/null +++ b/gbser_posix.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +2 warnings and 1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/gbser_posix.cc. diff --git a/gbser_win.cc.note b/gbser_win.cc.note new file mode 100644 index 000000000..6ded238b2 --- /dev/null +++ b/gbser_win.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +2 errors generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/gbser_win.cc. diff --git a/gbsleep.cc.note b/gbsleep.cc.note new file mode 100644 index 000000000..aab7ff4cf --- /dev/null +++ b/gbsleep.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/gbsleep.cc. diff --git a/gdb.cc b/gdb.cc index 344d516a3..3116f9e3b 100644 --- a/gdb.cc +++ b/gdb.cc @@ -30,7 +30,7 @@ #include "grtcirc.h" #include "jeeps/gpsmath.h" #include -#include +#include #define MYNAME "gdb" diff --git a/gdb.cc.note b/gdb.cc.note new file mode 100644 index 000000000..a2feb0d80 --- /dev/null +++ b/gdb.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +3 errors generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/gdb.cc. diff --git a/geo.cc b/geo.cc index 32dad5cd3..52f88838a 100644 --- a/geo.cc +++ b/geo.cc @@ -17,10 +17,10 @@ */ #include "defs.h" +#include "src/core/file.h" +#include #include #include -#include -#include "src/core/file.h" static char* deficon = NULL; static char* nuke_placer; diff --git a/geo.cc.note b/geo.cc.note new file mode 100644 index 000000000..079d9ac49 --- /dev/null +++ b/geo.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +6 warnings and 1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/geo.cc. diff --git a/geojson.cc b/geojson.cc index e206459fb..b8ee428fc 100644 --- a/geojson.cc +++ b/geojson.cc @@ -17,10 +17,10 @@ */ #include "defs.h" +#include "src/core/file.h" +#include #include #include -#include -#include "src/core/file.h" static gbfile* ofd; static QString input_file_name; diff --git a/geojson.cc.note b/geojson.cc.note new file mode 100644 index 000000000..c3f8490b5 --- /dev/null +++ b/geojson.cc.note @@ -0,0 +1,5 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +18 warnings and 1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/geojson.cc. +Suppressed 18 warnings (18 with check filters). diff --git a/ggv_bin.cc.note b/ggv_bin.cc.note new file mode 100644 index 000000000..8e1ad900f --- /dev/null +++ b/ggv_bin.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/ggv_bin.cc. diff --git a/ggv_log.cc b/ggv_log.cc index 72f5f81ab..f843782cd 100644 --- a/ggv_log.cc +++ b/ggv_log.cc @@ -20,10 +20,10 @@ */ -#include -#include -#include -#include +#include +#include +#include +#include #include "defs.h" #include "grtcirc.h" diff --git a/ggv_log.cc.note b/ggv_log.cc.note new file mode 100644 index 000000000..6e3ce3bf2 --- /dev/null +++ b/ggv_log.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/ggv_log.cc. diff --git a/ggv_ovl.cc b/ggv_ovl.cc index 2393fa46a..e0a8a59eb 100644 --- a/ggv_ovl.cc +++ b/ggv_ovl.cc @@ -22,12 +22,12 @@ #include "defs.h" #include "cet_util.h" -#include "inifile.h" #include "grtcirc.h" +#include "inifile.h" #include -#include -#include +#include +#include #define MYNAME "ggv_ovl" diff --git a/ggv_ovl.cc.note b/ggv_ovl.cc.note new file mode 100644 index 000000000..c4f9321a0 --- /dev/null +++ b/ggv_ovl.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 warning and 1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/ggv_ovl.cc. diff --git a/globals.cc.note b/globals.cc.note new file mode 100644 index 000000000..2049d74c0 --- /dev/null +++ b/globals.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/globals.cc. diff --git a/globalsat_sport.cc b/globalsat_sport.cc index 6fae7d640..351035ec0 100644 --- a/globalsat_sport.cc +++ b/globalsat_sport.cc @@ -36,11 +36,11 @@ */ -#include -#include -#include #include "defs.h" #include "gbser.h" +#include +#include +#include #define MYNAME "GlobalsatSport" diff --git a/globalsat_sport.cc.note b/globalsat_sport.cc.note new file mode 100644 index 000000000..43a3d227f --- /dev/null +++ b/globalsat_sport.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +2 warnings and 1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/globalsat_sport.cc. diff --git a/glogbook.cc b/glogbook.cc index 1407a8f8c..8b4dd5237 100644 --- a/glogbook.cc +++ b/glogbook.cc @@ -20,8 +20,8 @@ */ #include "defs.h" -#include "xmlgeneric.h" #include "src/core/file.h" +#include "xmlgeneric.h" #include #include diff --git a/glogbook.cc.note b/glogbook.cc.note new file mode 100644 index 000000000..7c62d0da7 --- /dev/null +++ b/glogbook.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/glogbook.cc. diff --git a/gnav_trl.cc.note b/gnav_trl.cc.note new file mode 100644 index 000000000..493d262ec --- /dev/null +++ b/gnav_trl.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/gnav_trl.cc. diff --git a/googledir.cc.note b/googledir.cc.note new file mode 100644 index 000000000..5586fbf1d --- /dev/null +++ b/googledir.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/googledir.cc. diff --git a/gopal.cc b/gopal.cc index 59c136dee..0de7468be 100644 --- a/gopal.cc +++ b/gopal.cc @@ -51,12 +51,12 @@ #include "defs.h" #include "cet_util.h" #include "csv_util.h" -#include "strptime.h" -#include "jeeps/gpsmath.h" #include "grtcirc.h" -#include -#include +#include "jeeps/gpsmath.h" +#include "strptime.h" #include +#include +#include #define MYNAME "gopal" static gbfile* fin, *fout; diff --git a/gopal.cc.note b/gopal.cc.note new file mode 100644 index 000000000..b97eaea4a --- /dev/null +++ b/gopal.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 warning and 1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/gopal.cc. diff --git a/gpssim.cc b/gpssim.cc index 22bd88b97..954543b27 100644 --- a/gpssim.cc +++ b/gpssim.cc @@ -21,9 +21,9 @@ #include "defs.h" -#include -#include -#include +#include +#include +#include #define MYNAME "gpssim" diff --git a/gpssim.cc.note b/gpssim.cc.note new file mode 100644 index 000000000..a46aa53ca --- /dev/null +++ b/gpssim.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +2 warnings and 1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/gpssim.cc. diff --git a/gpsutil.cc b/gpsutil.cc index 546f100dd..f7dfbf19a 100644 --- a/gpsutil.cc +++ b/gpsutil.cc @@ -24,8 +24,8 @@ #include "cet_util.h" #include "magellan.h" #include -#include -#include +#include +#include static gbfile* file_in, *file_out; static short_handle mkshort_handle; diff --git a/gpsutil.cc.note b/gpsutil.cc.note new file mode 100644 index 000000000..a0b8c1bf8 --- /dev/null +++ b/gpsutil.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/gpsutil.cc. diff --git a/gpx.cc b/gpx.cc index 642a8f3bf..c77f4c471 100644 --- a/gpx.cc +++ b/gpx.cc @@ -23,17 +23,17 @@ #include "cet_util.h" #include "garmin_fs.h" #include "garmin_tables.h" -#include "src/core/logging.h" #include "src/core/file.h" +#include "src/core/logging.h" #include "src/core/xmlstreamwriter.h" #include "src/core/xmltag.h" -#include -#include #include #include +#include +#include -#include +#include static QXmlStreamReader* reader; diff --git a/gpx.cc.note b/gpx.cc.note new file mode 100644 index 000000000..010d2e62b --- /dev/null +++ b/gpx.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +4 errors generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/gpx.cc. diff --git a/grtcirc.cc b/grtcirc.cc index d590bfe58..39e633191 100644 --- a/grtcirc.cc +++ b/grtcirc.cc @@ -22,10 +22,10 @@ #include "defs.h" #include "grtcirc.h" +#include #include -#include -#include -#include +#include +#include static const double EARTH_RAD = 6378137.0; diff --git a/grtcirc.cc.note b/grtcirc.cc.note new file mode 100644 index 000000000..a458ea4d7 --- /dev/null +++ b/grtcirc.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/grtcirc.cc. diff --git a/gtm.cc.note b/gtm.cc.note new file mode 100644 index 000000000..21f615d30 --- /dev/null +++ b/gtm.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/gtm.cc. diff --git a/gtrnctr.cc b/gtrnctr.cc index 95acfe636..3c47b2db4 100644 --- a/gtrnctr.cc +++ b/gtrnctr.cc @@ -28,7 +28,7 @@ #include "defs.h" #include "xmlgeneric.h" -#include +#include static gbfile* ofd; static int lap_ct = 0; diff --git a/gtrnctr.cc.note b/gtrnctr.cc.note new file mode 100644 index 000000000..f69b46be5 --- /dev/null +++ b/gtrnctr.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/gtrnctr.cc. diff --git a/gui/.qmake.stash b/gui/.qmake.stash new file mode 100644 index 000000000..7f917ffbd --- /dev/null +++ b/gui/.qmake.stash @@ -0,0 +1,42 @@ +QMAKE_MAC_SDK.macosx.--show-sdk-path = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk +QMAKE_MAC_SDK.macosx.--show-sdk-platform-path = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform +QMAKE_MAC_SDK.macosx.--show-sdk-version = 10.13 +QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_CC = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang +QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_CXX = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ +QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_FIX_RPATH = \ + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/install_name_tool \ + -id +QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_AR = \ + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar \ + cq +QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_RANLIB = \ + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib \ + -s +QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_LINK = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ +QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_LINK_SHLIB = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ +QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_ACTOOL = /Applications/Xcode.app/Contents/Developer/usr/bin/actool +QMAKE_CXX.INCDIRS = \ + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 \ + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/9.0.0/include \ + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include \ + /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/usr/include +QMAKE_CXX.LIBDIRS = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/usr/lib +QMAKE_CXX.QT_COMPILER_STDCXX = 199711L +QMAKE_CXX.QMAKE_APPLE_CC = 6000 +QMAKE_CXX.QMAKE_APPLE_CLANG_MAJOR_VERSION = 9 +QMAKE_CXX.QMAKE_APPLE_CLANG_MINOR_VERSION = 0 +QMAKE_CXX.QMAKE_APPLE_CLANG_PATCH_VERSION = 0 +QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 4 +QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 2 +QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1 +QMAKE_CXX.COMPILER_MACROS = \ + QT_COMPILER_STDCXX \ + QMAKE_APPLE_CC \ + QMAKE_APPLE_CLANG_MAJOR_VERSION \ + QMAKE_APPLE_CLANG_MINOR_VERSION \ + QMAKE_APPLE_CLANG_PATCH_VERSION \ + QMAKE_GCC_MAJOR_VERSION \ + QMAKE_GCC_MINOR_VERSION \ + QMAKE_GCC_PATCH_VERSION +QMAKE_XCODE_DEVELOPER_PATH = /Applications/Xcode.app/Contents/Developer +QMAKE_XCODE_VERSION = 9.0.1 diff --git a/gui/app.pro.user b/gui/app.pro.user new file mode 100644 index 000000000..3eaf80664 --- /dev/null +++ b/gui/app.pro.user @@ -0,0 +1,216 @@ + + + + + + EnvironmentId + {bde38e34-291f-417e-b793-a8af8f4a200a} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.9.2 clang 64bit + Desktop Qt 5.9.2 clang 64bit + qt.592.clang_64_kit + 0 + 0 + 0 + + /Users/robertlipe/Documents/GitHub/gpsbabel/gui + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 1 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + app + + Qt4ProjectManager.Qt4RunConfiguration:/Users/robertlipe/Documents/GitHub/gpsbabel/gui/app.pro + true + + app.pro + false + + + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 18 + + + Version + 18 + + diff --git a/gui/dpencode.cc b/gui/dpencode.cc index 4ab5ec020..4444d8af9 100644 --- a/gui/dpencode.cc +++ b/gui/dpencode.cc @@ -24,9 +24,9 @@ // USA // //------------------------------------------------------------------------ -#include -#include #include "dpencode.h" +#include +#include using std::vector; using std::stack; diff --git a/gui/latlng.cc b/gui/latlng.cc index 11e506cb2..deb2a0cc6 100644 --- a/gui/latlng.cc +++ b/gui/latlng.cc @@ -20,8 +20,8 @@ // USA // //------------------------------------------------------------------------ -#include #include "latlng.h" +#include // copied from the web somewhere. diff --git a/height.cc b/height.cc index 963cae681..587552398 100644 --- a/height.cc +++ b/height.cc @@ -24,8 +24,8 @@ #include "defs.h" #include "filterdefs.h" -#include -#include +#include +#include #define MYNAME "height" diff --git a/height.cc.note b/height.cc.note new file mode 100644 index 000000000..6a9d704fb --- /dev/null +++ b/height.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/height.cc. diff --git a/hiketech.cc b/hiketech.cc index 3eba8186c..f3d51b3e5 100644 --- a/hiketech.cc +++ b/hiketech.cc @@ -20,10 +20,10 @@ */ #include "defs.h" -#include "xmlgeneric.h" #include "src/core/xmlstreamwriter.h" +#include "xmlgeneric.h" #include -#include +#include static gbfile* ofd; static QString ostring; diff --git a/hiketech.cc.note b/hiketech.cc.note new file mode 100644 index 000000000..1d4b104a5 --- /dev/null +++ b/hiketech.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/hiketech.cc. diff --git a/holux.cc b/holux.cc index 12a2a4cbf..c3c1ef6f2 100644 --- a/holux.cc +++ b/holux.cc @@ -28,8 +28,8 @@ History: #include "defs.h" #include "holux.h" //#include -#include -#include +#include +#include static gbfile* file_in, *file_out; static unsigned char* HxWFile; diff --git a/holux.cc.note b/holux.cc.note new file mode 100644 index 000000000..51e3b6578 --- /dev/null +++ b/holux.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 warning and 1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/holux.cc. diff --git a/html.cc b/html.cc index a8b9f39f8..407dd36d6 100644 --- a/html.cc +++ b/html.cc @@ -23,8 +23,8 @@ #include "defs.h" #include "jeeps/gpsmath.h" #include "src/core/xmltag.h" -#include -#include +#include +#include static gbfile* file_out; static short_handle mkshort_handle; diff --git a/html.cc.note b/html.cc.note new file mode 100644 index 000000000..ece97c919 --- /dev/null +++ b/html.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/html.cc. diff --git a/humminbird.cc b/humminbird.cc index a2e2f1882..4f0ee3f74 100644 --- a/humminbird.cc +++ b/humminbird.cc @@ -21,8 +21,8 @@ #include "defs.h" #include -#include -#include +#include +#include #define MYNAME "humminbird" diff --git a/humminbird.cc.note b/humminbird.cc.note new file mode 100644 index 000000000..7327500f2 --- /dev/null +++ b/humminbird.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/humminbird.cc. diff --git a/igc.cc b/igc.cc index e443f34ac..606ebbd33 100644 --- a/igc.cc +++ b/igc.cc @@ -25,10 +25,10 @@ #include "defs.h" #include "cet_util.h" -#include -#include -#include -#include +#include +#include +#include +#include static gbfile* file_in, *file_out; static char manufacturer[4]; diff --git a/igc.cc.note b/igc.cc.note new file mode 100644 index 000000000..c230cc238 --- /dev/null +++ b/igc.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +7 errors generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/igc.cc. diff --git a/ignrando.cc b/ignrando.cc index 97d469a1f..8274a2e9f 100644 --- a/ignrando.cc +++ b/ignrando.cc @@ -22,7 +22,7 @@ #include "defs.h" #include "xmlgeneric.h" #include -#include +#include #define MYNAME "IGNRando" diff --git a/ignrando.cc.note b/ignrando.cc.note new file mode 100644 index 000000000..ebe52dba7 --- /dev/null +++ b/ignrando.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/ignrando.cc. diff --git a/igo8.cc b/igo8.cc index e42853882..81c3925c6 100644 --- a/igo8.cc +++ b/igo8.cc @@ -64,7 +64,7 @@ #include "defs.h" #include "cet.h" #include "cet_util.h" -#include +#include #define FLOAT_TO_INT(x) ((int)((x) + ((x)<0?-0.5:0.5))) #define IGO8_HEADER_SIZE (sizeof(igo8_id_block) + 256) diff --git a/igo8.cc.note b/igo8.cc.note new file mode 100644 index 000000000..03697978b --- /dev/null +++ b/igo8.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 warning and 1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/igo8.cc. diff --git a/ik3d.cc.note b/ik3d.cc.note new file mode 100644 index 000000000..963b89e3f --- /dev/null +++ b/ik3d.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/ik3d.cc. diff --git a/inifile.cc b/inifile.cc index 03c858f62..aa5e8b000 100644 --- a/inifile.cc +++ b/inifile.cc @@ -20,8 +20,8 @@ #include "defs.h" #include "inifile.h" -#include -#include +#include +#include #define MYNAME "inifile" diff --git a/inifile.cc.note b/inifile.cc.note new file mode 100644 index 000000000..e1563cf5e --- /dev/null +++ b/inifile.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +5 warnings and 1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/inifile.cc. diff --git a/internal_styles.cc.note b/internal_styles.cc.note new file mode 100644 index 000000000..1c3a51f33 --- /dev/null +++ b/internal_styles.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/internal_styles.cc. diff --git a/interpolate.cc b/interpolate.cc index 498a5a1af..09c52965e 100644 --- a/interpolate.cc +++ b/interpolate.cc @@ -22,7 +22,7 @@ #include "defs.h" #include "filterdefs.h" #include "grtcirc.h" -#include +#include #if FILTERS_ENABLED #define MYNAME "Interpolate filter" diff --git a/interpolate.cc.note b/interpolate.cc.note new file mode 100644 index 000000000..137422308 --- /dev/null +++ b/interpolate.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/interpolate.cc. diff --git a/itracku.cc b/itracku.cc index 47b2bcf1e..8c7f76cb0 100644 --- a/itracku.cc +++ b/itracku.cc @@ -31,9 +31,9 @@ */ #include "defs.h" #include "gbser.h" -#include -#include -#include +#include +#include +#include #define MYNAME "itracku" diff --git a/itracku.cc.note b/itracku.cc.note new file mode 100644 index 000000000..2632c6980 --- /dev/null +++ b/itracku.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/itracku.cc. diff --git a/jeeps/garminusb.h b/jeeps/garminusb.h index e61fa2ade..476e70feb 100644 --- a/jeeps/garminusb.h +++ b/jeeps/garminusb.h @@ -19,6 +19,7 @@ */ #include +#include "gpsdevice.h" /* This structure is a bit funny looking to avoid variable length * arrays which aren't present in C89. This contains the visible diff --git a/jeeps/gps.h b/jeeps/gps.h index ddcc1b654..7ef2d3e5e 100644 --- a/jeeps/gps.h +++ b/jeeps/gps.h @@ -282,10 +282,10 @@ extern struct COMMANDDATA COMMAND_ID[2]; extern struct LINKDATA LINK_ID[3]; extern struct GPS_MODEL_PROTOCOL GPS_MP[]; -extern char* gps_marine_sym[]; -extern char* gps_land_sym[]; -extern char* gps_aviation_sym[]; -extern char* gps_16_sym[]; +extern const char* gps_marine_sym[]; +extern const char* gps_land_sym[]; +extern const char* gps_aviation_sym[]; +extern const char* gps_16_sym[]; #endif diff --git a/jeeps/gpsapp.cc b/jeeps/gpsapp.cc index 421bd4062..52a629809 100644 --- a/jeeps/gpsapp.cc +++ b/jeeps/gpsapp.cc @@ -24,19 +24,19 @@ ** Boston, MA 02111-1307, USA. ********************************************************************/ #include "gps.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* * This violates the layering design, but is needed for device discovery. * See the use of gps_is_usb and GPS_Packet_Read_usb below. */ #include "garminusb.h" -#include "gpsusbint.h" #include "gpsserial.h" +#include "gpsusbint.h" time_t gps_save_time; double gps_save_lat; diff --git a/jeeps/gpscom.cc b/jeeps/gpscom.cc index 0420ed352..f485e5f22 100644 --- a/jeeps/gpscom.cc +++ b/jeeps/gpscom.cc @@ -25,9 +25,9 @@ ** Boston, MA 02111-1307, USA. ********************************************************************/ #include "gps.h" -#include -#include -#include +#include +#include +#include /* @func GPS_Command_Off *********************************************** @@ -797,6 +797,7 @@ int32 GPS_Command_Send_Course switch (gps_course_limits_transfer) { case pA1009: ret = GPS_A1009_Get(port,&limits); + Q_UNUSED(ret); break; default: GPS_Error("Send_Course: Unknown course limitsprotocol"); diff --git a/jeeps/gpsdevice_ser.cc b/jeeps/gpsdevice_ser.cc index 317db200d..2e3a847ed 100644 --- a/jeeps/gpsdevice_ser.cc +++ b/jeeps/gpsdevice_ser.cc @@ -21,8 +21,8 @@ #include "gps.h" #include "gpsdevice.h" -#include "gpsserial.h" #include "gpsread.h" +#include "gpsserial.h" gps_device_ops gps_serial_ops = { GPS_Serial_On, diff --git a/jeeps/gpsdevice_usb.cc b/jeeps/gpsdevice_usb.cc index b7afe4955..6425721a9 100644 --- a/jeeps/gpsdevice_usb.cc +++ b/jeeps/gpsdevice_usb.cc @@ -20,10 +20,10 @@ */ #include "gps.h" -#include "gpsdevice.h" #include "garminusb.h" -#include "gpsusbint.h" +#include "gpsdevice.h" #include "gpsusbcommon.h" +#include "gpsusbint.h" garmin_unit_info_t garmin_unit_info[GUSB_MAX_UNITS]; diff --git a/jeeps/gpsfmt.cc b/jeeps/gpsfmt.cc index af355a273..0db4c4fe7 100644 --- a/jeeps/gpsfmt.cc +++ b/jeeps/gpsfmt.cc @@ -22,8 +22,8 @@ ** Boston, MA 02111-1307, USA. ********************************************************************/ #include "gps.h" -#include -#include +#include +#include static void GPS_Fmt_Print_Way100(GPS_PWay way, FILE* outf); @@ -49,7 +49,7 @@ static void GPS_Fmt_Print_D301(GPS_PTrack trk, FILE* outf); static int32 GPS_Fmt_Print_Route201(GPS_PWay* way, int32 n, FILE* outf); -char* gps_marine_sym[]= { +const char* gps_marine_sym[]= { "Anchor","Bell","Diamond-grn","Diamond_red","Dive1","Dive2","Dollar", "Fish","Fuel","Horn","House","Knife","Light","Mug","Skull", "Square_grn","Square_red","Wbuoy","Wpt_dot","Wreck","Null","Mob", @@ -80,7 +80,7 @@ char* gps_marine_sym[]= { -char* gps_land_sym[]= { +const char* gps_land_sym[]= { "Is_hwy","Us_hwy","St_hwy","Mi_mrkr","Trcbck","Golf","Sml_cty", "Med_cty","Lrg_cty","Freeway","Ntl_hwy","Cap_cty","Amuse_pk", "Bowling","Car_rental","Car_repair","Fastfood","Fitness","Film", @@ -95,14 +95,14 @@ char* gps_land_sym[]= { }; -char* gps_aviation_sym[]= { +const char* gps_aviation_sym[]= { "Airport","Int","Ndb","Vor","Heliport","Private","Soft_fld", "Tall_tower","Short_tower","Glider","Ultralight","Parachute", "Vortac","Vordme","Faf","Lom","Map","Tacan","Seaplane" }; -char* gps_16_sym[]= { +const char* gps_16_sym[]= { "Dot","House","Fuel","Car","Fish","Boat","Anchor","Wreck", "Exit","Skull","Flag","Camp","Circle-x","Deer","1st_aid","Back_track" }; @@ -680,7 +680,7 @@ static void GPS_Fmt_Print_Way101(GPS_PWay way, FILE* outf) static void GPS_Fmt_Print_Way102(GPS_PWay way, FILE* outf) { - char** p; + const char** p; int32 x; if (way->smbl < 8192) { @@ -718,7 +718,7 @@ static void GPS_Fmt_Print_Way102(GPS_PWay way, FILE* outf) static void GPS_Fmt_Print_Way103(GPS_PWay way, FILE* outf) { - static char* dspl[]= { + static const char* dspl[]= { "SW","S","SC" }; @@ -747,10 +747,10 @@ static void GPS_Fmt_Print_Way103(GPS_PWay way, FILE* outf) static void GPS_Fmt_Print_Way104(GPS_PWay way, FILE* outf) { - static char* dspl[]= { + static const char* dspl[]= { "S","S","","SW","","SC" }; - char** p; + const char** p; int32 x; if (way->smbl < 8192) { @@ -789,7 +789,7 @@ static void GPS_Fmt_Print_Way104(GPS_PWay way, FILE* outf) static void GPS_Fmt_Print_Way105(GPS_PWay way, FILE* outf) { - char** p; + const char** p; int32 x; if (way->smbl < 8192) { @@ -825,7 +825,7 @@ static void GPS_Fmt_Print_Way105(GPS_PWay way, FILE* outf) static void GPS_Fmt_Print_Way106(GPS_PWay way, FILE* outf) { - char** p; + const char** p; int32 x; if (way->smbl < 8192) { @@ -874,10 +874,10 @@ static void GPS_Fmt_Print_Way106(GPS_PWay way, FILE* outf) static void GPS_Fmt_Print_Way107(GPS_PWay way, FILE* outf) { - static char* dspl[]= { + static const char* dspl[]= { "SW","S","SC" }; - static char* col[]= { + static const char* col[]= { "Default","Red","Green","Blue" }; @@ -910,14 +910,14 @@ static void GPS_Fmt_Print_Way107(GPS_PWay way, FILE* outf) static void GPS_Fmt_Print_Way108(GPS_PWay way, FILE* outf) { - char** p; + const char** p; int32 x; - static char* dspl[]= { + static const char* dspl[]= { "SW","S","SC" }; - static char* col[]= { + static const char* col[]= { "Black","Dark_Red","Dark_Green","Dark_Yellow","Dark_Blue", "Dark_Magenta","Dark_Cyan","Light_Grey","Dark_Grey","Red","Green", "Yellow","Blue","Magenta","Cyan","White" @@ -985,14 +985,14 @@ static void GPS_Fmt_Print_Way108(GPS_PWay way, FILE* outf) static void GPS_Fmt_Print_Way109(GPS_PWay way, FILE* outf) { - char** p; + const char** p; int32 x; - static char* dspl[]= { + static const char* dspl[]= { "SW","S","SC" }; - static char* col[]= { + static const char* col[]= { "Black","Dark_Red","Dark_Green","Dark_Yellow","Dark_Blue", "Dark_Magenta","Dark_Cyan","Light_Grey","Dark_Grey","Red","Green", "Yellow","Blue","Magenta","Cyan","White" @@ -1160,7 +1160,7 @@ static void GPS_Fmt_Print_Way152(GPS_PWay way, FILE* outf) static void GPS_Fmt_Print_Way154(GPS_PWay way, FILE* outf) { - char** p; + const char** p; int32 x; if (way->smbl < 8192) { @@ -1208,11 +1208,11 @@ static void GPS_Fmt_Print_Way154(GPS_PWay way, FILE* outf) static void GPS_Fmt_Print_Way155(GPS_PWay way, FILE* outf) { - static char* dspl[]= { + static const char* dspl[]= { "","S","","SW","","SC" }; - char** p; + const char** p; int32 x; if (way->smbl < 8192) { diff --git a/jeeps/gpsinput.cc b/jeeps/gpsinput.cc index 66e708b70..4246160ae 100644 --- a/jeeps/gpsinput.cc +++ b/jeeps/gpsinput.cc @@ -22,10 +22,10 @@ ** Boston, MA 02111-1307, USA. ********************************************************************/ #include "gps.h" -#include -#include -#include -#include +#include +#include +#include +#include static int32 GPS_Input_Load_String(char* t, int32 n, char* s); diff --git a/jeeps/gpslibusb.cc b/jeeps/gpslibusb.cc index 728c7447a..7379ac57a 100644 --- a/jeeps/gpslibusb.cc +++ b/jeeps/gpslibusb.cc @@ -20,9 +20,9 @@ */ -#include -#include -#include +#include +#include +#include #if HAVE_CONFIG_H #include "config.h" #endif diff --git a/jeeps/gpsmath.cc b/jeeps/gpsmath.cc index b743a1794..8d37422f6 100644 --- a/jeeps/gpsmath.cc +++ b/jeeps/gpsmath.cc @@ -22,10 +22,10 @@ ** Boston, MA 02111-1307, USA. ********************************************************************/ #include "gps.h" -#include -#include -#include #include "gpsdatum.h" +#include +#include +#include static int32 GPS_Math_LatLon_To_UTM_Param(double lat, double lon, int32* zone, diff --git a/jeeps/gpsmem.cc b/jeeps/gpsmem.cc index 3148898b2..1066ee28a 100644 --- a/jeeps/gpsmem.cc +++ b/jeeps/gpsmem.cc @@ -25,10 +25,10 @@ ** Boston, MA 02111-1307, USA. ********************************************************************/ #include "gps.h" -#include -#include -#include -#include +#include +#include +#include +#include /* @func GPS_Pvt_New *********************************************** ** diff --git a/jeeps/gpsproj.cc b/jeeps/gpsproj.cc index 3ecbcf71d..5a8f13423 100644 --- a/jeeps/gpsproj.cc +++ b/jeeps/gpsproj.cc @@ -22,8 +22,8 @@ ** Boston, MA 02111-1307, USA. ********************************************************************/ #include "gps.h" -#include -#include +#include +#include /* @func GPS_Math_Albers_LatLon_To_EN ********************************** diff --git a/jeeps/gpsprot.cc b/jeeps/gpsprot.cc index 85304bfee..9960650cf 100644 --- a/jeeps/gpsprot.cc +++ b/jeeps/gpsprot.cc @@ -24,7 +24,7 @@ ********************************************************************/ #define COMMON #include "gps.h" -#include +#include #define GPS_TAGUNK 20 diff --git a/jeeps/gpsread.cc b/jeeps/gpsread.cc index 9e0171f6e..ab6851c45 100644 --- a/jeeps/gpsread.cc +++ b/jeeps/gpsread.cc @@ -22,12 +22,14 @@ ** Free Software Foundation, Inc., 59 Temple Place - Suite 330, ** Boston, MA 02111-1307, USA. ********************************************************************/ + +#include +#include +#include +#include + #include "gps.h" #include "gpsserial.h" -#include -#include -#include -#include /* @func GPS_Time_Now *********************************************** diff --git a/jeeps/gpssend.cc b/jeeps/gpssend.cc index 4c386a12c..52e0b3910 100644 --- a/jeeps/gpssend.cc +++ b/jeeps/gpssend.cc @@ -22,13 +22,13 @@ ** Free Software Foundation, Inc., 59 Temple Place - Suite 330, ** Boston, MA 02111-1307, USA. ********************************************************************/ -#include "gps.h" -#include "gpsserial.h" -#include -#include -#include +#include +#include +#include +#include "gps.h" +#include "gpsserial.h" /* @funcstatic Build_Serial_Packet ************************************* ** diff --git a/jeeps/gpsserial.cc b/jeeps/gpsserial.cc index 5ddd97aed..8e245674c 100644 --- a/jeeps/gpsserial.cc +++ b/jeeps/gpsserial.cc @@ -24,14 +24,14 @@ ** Boston, MA 02111-1307, USA. ********************************************************************/ #include "gps.h" -#include "gpsserial.h" #include "../gbser.h" -#include -#include +#include "gpsserial.h" +#include +#include +#include #include -#include -#include -#include +#include +#include int gps_baud_rate = DEFAULT_BAUD; diff --git a/jeeps/gpsusbread.cc b/jeeps/gpsusbread.cc index 40b8c23be..d3ec1cdf4 100644 --- a/jeeps/gpsusbread.cc +++ b/jeeps/gpsusbread.cc @@ -18,10 +18,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA */ -#include -#include "gps.h" #include "garminusb.h" +#include "gps.h" #include "gpsusbint.h" +#include /* * Return values are: diff --git a/jeeps/gpsusbsend.cc b/jeeps/gpsusbsend.cc index de433adff..7448daab3 100644 --- a/jeeps/gpsusbsend.cc +++ b/jeeps/gpsusbsend.cc @@ -20,10 +20,10 @@ */ #include "gps.h" -#include -#include #include "garminusb.h" #include "gpsusbint.h" +#include +#include int32 GPS_Write_Packet_usb(gpsdevh*, GPS_PPacket& packet) diff --git a/jeeps/gpsusbwin.cc b/jeeps/gpsusbwin.cc index fc405fccf..373e5efac 100644 --- a/jeeps/gpsusbwin.cc +++ b/jeeps/gpsusbwin.cc @@ -19,19 +19,19 @@ */ -#include -#include +#include +#include +#include #include +#include #include #include -#include -#include +#include "../garmin_device_xml.h" +#include "garminusb.h" #include "gps.h" #include "gpsapp.h" -#include "garminusb.h" #include "gpsusbcommon.h" -#include "../garmin_device_xml.h" /* Constants from Garmin doc. */ diff --git a/jeeps/jgpsutil.cc b/jeeps/jgpsutil.cc index 775222434..9d151d25d 100644 --- a/jeeps/jgpsutil.cc +++ b/jeeps/jgpsutil.cc @@ -22,9 +22,9 @@ ** Boston, MA 02111-1307, USA. ********************************************************************/ #include "gps.h" -#include +#include +#include #include -#include static int32 gps_endian_called=0; static int32 GPS_Little=0; diff --git a/jogmap.cc.note b/jogmap.cc.note new file mode 100644 index 000000000..e33e7e73d --- /dev/null +++ b/jogmap.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 warning and 1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/jogmap.cc. diff --git a/jtr.cc b/jtr.cc index 739bf309b..716d7cff7 100644 --- a/jtr.cc +++ b/jtr.cc @@ -23,8 +23,8 @@ #include "csv_util.h" #include #include -#include -#include +#include +#include #define MYNAME "jtr" diff --git a/jtr.cc.note b/jtr.cc.note new file mode 100644 index 000000000..fb1700f5e --- /dev/null +++ b/jtr.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/jtr.cc. diff --git a/kml.cc b/kml.cc index 5954cf004..68923cd05 100644 --- a/kml.cc +++ b/kml.cc @@ -25,16 +25,16 @@ #endif #include "defs.h" -#include "xmlgeneric.h" #include "grtcirc.h" #include "src/core/file.h" #include "src/core/xmlstreamwriter.h" #include "src/core/xmltag.h" +#include "xmlgeneric.h" #include #include -#include -#include -#include +#include +#include +#include // options static char* opt_deficon = NULL; diff --git a/kml.cc.note b/kml.cc.note new file mode 100644 index 000000000..92aa1f4cf --- /dev/null +++ b/kml.cc.note @@ -0,0 +1,4 @@ +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/.cc. +1 error generated. +Error while processing /Users/robertlipe/Documents/GitHub/gpsbabel/kml.cc. diff --git a/lmx.cc b/lmx.cc index fd1e58fc3..8f3c8942f 100644 --- a/lmx.cc +++ b/lmx.cc @@ -28,8 +28,8 @@ #include "defs.h" #include "xmlgeneric.h" -#include #include +#include static gbfile* ofd; static Waypoint* wpt_tmp; diff --git a/lowranceusr.cc b/lowranceusr.cc index 3fd2c5214..a1087c795 100644 --- a/lowranceusr.cc +++ b/lowranceusr.cc @@ -34,9 +34,9 @@ #include "defs.h" #include -#include #include /* for lat/lon conversion */ -#include // atoi +#include // atoi +#include typedef struct lowranceusr_icon_mapping { const int value; diff --git a/lowranceusr4.cc b/lowranceusr4.cc index fb237eeee..f7a060169 100644 --- a/lowranceusr4.cc +++ b/lowranceusr4.cc @@ -26,10 +26,10 @@ #include "defs.h" -#include /* for lat/lon conversion */ -#include /* for gmtime */ -#include /* for gmtime */ -#include // atoi +#include /* for lat/lon conversion */ +#include /* for gmtime */ +#include // atoi +#include /* for gmtime */ /* from waypt.c, we need to iterate over waypoints when extracting routes */ diff --git a/maggeo.cc b/maggeo.cc index c6d433050..44b86da89 100644 --- a/maggeo.cc +++ b/maggeo.cc @@ -21,12 +21,12 @@ #include "defs.h" #include "csv_util.h" -#include "xmlgeneric.h" #include "magellan.h" +#include "xmlgeneric.h" #include #include -#include -#include +#include +#include #define MYNAME "maggeo" diff --git a/magproto.cc b/magproto.cc index b0a9b26ee..3e54b7cac 100644 --- a/magproto.cc +++ b/magproto.cc @@ -21,18 +21,18 @@ */ #include "defs.h" -#include "magellan.h" -#include "gbser.h" #include "explorist_ini.h" +#include "gbser.h" +#include "magellan.h" #if HAVE_GLOB #include #endif -#include -#include -#include -#include #include +#include +#include +#include +#include static int bitrate = 4800; static int wptcmtcnt; diff --git a/main.cc b/main.cc index fc354dc97..f57fb0ea2 100644 --- a/main.cc +++ b/main.cc @@ -17,22 +17,22 @@ */ -#include #include +#include #include -#include "defs.h" -#include "filterdefs.h" #include "cet.h" #include "cet_util.h" #include "csv_util.h" +#include "defs.h" +#include "filterdefs.h" #include "inifile.h" #include "session.h" #include "src/core/usasciicodec.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #define MYNAME "main" diff --git a/mapasia.cc b/mapasia.cc index bb1a5e05e..5e2ca6375 100644 --- a/mapasia.cc +++ b/mapasia.cc @@ -20,11 +20,11 @@ */ -#include -#include -#include -#include #include "defs.h" +#include +#include +#include +#include //#include "session.h" #define MYNAME "mapasia" diff --git a/mapfactor.cc b/mapfactor.cc index 2f5753e6b..062f023ed 100644 --- a/mapfactor.cc +++ b/mapfactor.cc @@ -19,9 +19,9 @@ #include "defs.h" #include "src/core/file.h" #include "src/core/xmlstreamwriter.h" +#include #include #include -#include static gpsbabel::File* oqfile; static QXmlStreamWriter* writer; diff --git a/mapsend.cc b/mapsend.cc index bf1571904..9a350c0d7 100644 --- a/mapsend.cc +++ b/mapsend.cc @@ -19,11 +19,11 @@ */ #include "defs.h" -#include "mapsend.h" #include "magellan.h" +#include "mapsend.h" #include -#include -#include +#include +#include static gbfile* mapsend_file_in; static gbfile* mapsend_file_out; diff --git a/mapsource.cc b/mapsource.cc index fc143852b..65bb1f8b2 100644 --- a/mapsource.cc +++ b/mapsource.cc @@ -24,9 +24,9 @@ #include "defs.h" #include "garmin_tables.h" #include "jeeps/gpsmath.h" -#include -#include #include +#include +#include static gbfile* mps_file_in; static gbfile* mps_file_out; diff --git a/mkicondoc.cc b/mkicondoc.cc index 101ccbf51..fb0d46153 100644 --- a/mkicondoc.cc +++ b/mkicondoc.cc @@ -3,11 +3,11 @@ #include "fatal.cc" -#include "util.cc" #include "cet.cc" #include "globals.cc" #include "jeeps/gpsmath.cc" -#include // qsort +#include "util.cc" +#include // qsort diff --git a/mkshort.cc b/mkshort.cc index aa75e7f18..78ec64634 100644 --- a/mkshort.cc +++ b/mkshort.cc @@ -23,10 +23,10 @@ #include "cet.h" #include "cet_util.h" -#include -#include -#include -#include +#include +#include +#include +#include #define MYNAME "mkshort" diff --git a/mmo.cc b/mmo.cc index fdbf26d31..82b600ba5 100644 --- a/mmo.cc +++ b/mmo.cc @@ -22,9 +22,9 @@ #include "defs.h" #include -#include -#include -#include +#include +#include +#include #define MYNAME "mmo" diff --git a/mtk_locus.cc b/mtk_locus.cc index f2e4ce55e..2de7e7b70 100644 --- a/mtk_locus.cc +++ b/mtk_locus.cc @@ -39,9 +39,9 @@ Example usage:: #include "defs.h" #include "gbser.h" -#include -#include -#include +#include +#include +#include static route_head* track; diff --git a/mtk_logger.cc b/mtk_logger.cc index 2690e700e..1440eabc1 100644 --- a/mtk_logger.cc +++ b/mtk_logger.cc @@ -55,12 +55,12 @@ #include "defs.h" -#include "gbser.h" #include "gbfile.h" /* used for csv output */ +#include "gbser.h" #include -#include -#include -#include +#include +#include +#include #if __WIN32__ #include #else diff --git a/navicache.cc b/navicache.cc index 79efe6f2f..85dc15d2e 100644 --- a/navicache.cc +++ b/navicache.cc @@ -18,8 +18,8 @@ */ #include "defs.h" #include "cet_util.h" -#include #include "src/core/file.h" +#include static char* noretired = NULL; static QString read_fname; diff --git a/naviguide.cc b/naviguide.cc index 1e59ffa7c..f035e1ab9 100644 --- a/naviguide.cc +++ b/naviguide.cc @@ -25,7 +25,7 @@ #include "jeeps/gpsmath.h" #include #include -#include +#include #define MYNAME "Naviguide" diff --git a/netstumbler.cc b/netstumbler.cc index 545d66fdc..61332d46f 100644 --- a/netstumbler.cc +++ b/netstumbler.cc @@ -23,9 +23,9 @@ #include "defs.h" #include "cet_util.h" #include "csv_util.h" -#include -#include -#include +#include +#include +#include static gbfile* file_in; static char* nseicon = NULL; diff --git a/nmea.cc b/nmea.cc index 38b0cc652..8df687d50 100644 --- a/nmea.cc +++ b/nmea.cc @@ -24,15 +24,15 @@ #include "defs.h" #include "cet_util.h" #include "gbser.h" -#include "strptime.h" #include "jeeps/gpsmath.h" #include "src/core/logging.h" +#include "strptime.h" -#include -#include -#include -#include +#include +#include +#include #include +#include #include diff --git a/nmn4.cc b/nmn4.cc index 63950c811..0b95e70ca 100644 --- a/nmn4.cc +++ b/nmn4.cc @@ -29,10 +29,10 @@ #include "defs.h" #include "cet_util.h" #include "csv_util.h" -#include -#include -#include -#include +#include +#include +#include +#include static gbfile* fin, *fout; static int curr_rte_num, target_rte_num; diff --git a/ozi.cc b/ozi.cc index 7a8af21bc..3f9fe2e57 100644 --- a/ozi.cc +++ b/ozi.cc @@ -26,11 +26,11 @@ #include "cet_util.h" #include "csv_util.h" #include "jeeps/gpsmath.h" +#include +#include #include #include /* for floor */ -#include -#include -#include +#include #define MYNAME "OZI" #define BADCHARS ",\r\n" diff --git a/parse.cc b/parse.cc index 981e2f1b6..996ffc0fb 100644 --- a/parse.cc +++ b/parse.cc @@ -22,9 +22,9 @@ #include "defs.h" #include "jeeps/gpsmath.h" -#include -#include -#include //strtod +#include +#include +#include //strtod /* * parse_distance: diff --git a/pcx.cc b/pcx.cc index e181966a1..6cde09dee 100644 --- a/pcx.cc +++ b/pcx.cc @@ -20,13 +20,13 @@ */ #include "defs.h" -#include "garmin_tables.h" #include "cet_util.h" #include "csv_util.h" -#include -#include -#include +#include "garmin_tables.h" #include +#include +#include +#include static gbfile* file_in, *file_out; static short_handle mkshort_handle; diff --git a/pocketfms_wp.cc b/pocketfms_wp.cc index dc6bccbe0..6809a1df5 100644 --- a/pocketfms_wp.cc +++ b/pocketfms_wp.cc @@ -20,8 +20,8 @@ #include "defs.h" #include "csv_util.h" -#include -#include +#include +#include #define MYNAME "PocketFMS waypoint text file format" diff --git a/polygon.cc b/polygon.cc index bb8f73bb9..1d4722aa8 100644 --- a/polygon.cc +++ b/polygon.cc @@ -20,7 +20,7 @@ */ #include "defs.h" #include "filterdefs.h" -#include +#include #if FILTERS_ENABLED #define MYNAME "Polygon filter" diff --git a/position.cc b/position.cc index 2b06c5db3..96bbb3b63 100644 --- a/position.cc +++ b/position.cc @@ -22,8 +22,8 @@ #include "defs.h" #include "filterdefs.h" #include "grtcirc.h" -#include -#include +#include +#include #if FILTERS_ENABLED diff --git a/psitrex.cc b/psitrex.cc index 358933bd3..f98b968d8 100644 --- a/psitrex.cc +++ b/psitrex.cc @@ -21,9 +21,9 @@ #include "defs.h" #include "garmin_tables.h" -#include -#include -#include +#include +#include +#include #define MYNAME "PSITREX" diff --git a/queue.cc b/queue.cc index 7a21998f2..bba69cd14 100644 --- a/queue.cc +++ b/queue.cc @@ -20,7 +20,7 @@ */ #include "queue.h" -#include +#include void enqueue(queue* new_el, queue* old) diff --git a/radius.cc b/radius.cc index c80cf52d0..bfef1c2e4 100644 --- a/radius.cc +++ b/radius.cc @@ -21,8 +21,8 @@ #include "defs.h" #include "filterdefs.h" #include "grtcirc.h" -#include -#include +#include +#include #if FILTERS_ENABLED diff --git a/random.cc b/random.cc index 1b4d96353..2ef96571d 100644 --- a/random.cc +++ b/random.cc @@ -21,8 +21,8 @@ #include "defs.h" #include "garmin_fs.h" #include "jeeps/gpsmath.h" -#include -#include +#include +#include #define MYNAME "random" diff --git a/raymarine.cc b/raymarine.cc index 988ddab9c..24f98a3bc 100644 --- a/raymarine.cc +++ b/raymarine.cc @@ -48,9 +48,9 @@ #include "csv_util.h" #include "inifile.h" -#include -#include -#include +#include +#include +#include typedef unsigned long long guid_t; diff --git a/rgbcolors.cc b/rgbcolors.cc index 68027081a..76caaf9a1 100644 --- a/rgbcolors.cc +++ b/rgbcolors.cc @@ -20,7 +20,7 @@ */ #include "defs.h" -#include +#include /* * Colors derived from http://www.w3.org/TR/SVG/types.html#ColorKeywords diff --git a/route.cc b/route.cc index a40845bca..6d6be6732 100644 --- a/route.cc +++ b/route.cc @@ -17,10 +17,10 @@ */ -#include #include "defs.h" #include "grtcirc.h" #include "session.h" +#include static queue my_route_head; static queue my_track_head; diff --git a/saroute.cc b/saroute.cc index 35052c841..bc7496dfa 100644 --- a/saroute.cc +++ b/saroute.cc @@ -23,7 +23,7 @@ #define MYNAME "saroute" #include "defs.h" #include "grtcirc.h" -#include +#include gbfile* infile; diff --git a/shape.cc b/shape.cc index 1256bc076..e24e5b069 100644 --- a/shape.cc +++ b/shape.cc @@ -21,7 +21,7 @@ */ #include "defs.h" #include "shapelib/shapefil.h" -#include +#include #if SHAPELIB_ENABLED static SHPHandle ihandle; diff --git a/skyforce.cc b/skyforce.cc index fa1cd6c0f..011af1c1c 100644 --- a/skyforce.cc +++ b/skyforce.cc @@ -23,9 +23,9 @@ #include "defs.h" -#include -#include -#include +#include +#include +#include #define MYNAME "skyforce" diff --git a/skytraq.cc b/skytraq.cc index df36d2994..e9faea28e 100644 --- a/skytraq.cc +++ b/skytraq.cc @@ -25,9 +25,9 @@ #include "defs.h" #include "gbser.h" -#include -#include -#include +#include +#include +#include #define MYNAME "skytraq" diff --git a/smplrout.cc b/smplrout.cc index 576263194..8cf24baf4 100644 --- a/smplrout.cc +++ b/smplrout.cc @@ -59,7 +59,7 @@ #include "defs.h" #include "filterdefs.h" #include "grtcirc.h" -#include +#include #define MYNAME "simplify" diff --git a/sort.cc b/sort.cc index c1a497f2f..a4dda46ce 100644 --- a/sort.cc +++ b/sort.cc @@ -20,7 +20,7 @@ */ #include "defs.h" #include "filterdefs.h" -#include +#include #if FILTERS_ENABLED diff --git a/stackfilter.cc b/stackfilter.cc index 303f94adc..fd7e31355 100644 --- a/stackfilter.cc +++ b/stackfilter.cc @@ -21,7 +21,7 @@ #include "defs.h" #include "filterdefs.h" -#include +#include #if FILTERS_ENABLED diff --git a/subrip.cc b/subrip.cc index 4ad02d135..04cb1628e 100644 --- a/subrip.cc +++ b/subrip.cc @@ -21,7 +21,7 @@ */ #include "defs.h" -#include /* for gmtime */ +#include /* for gmtime */ #define MYNAME "subrip" diff --git a/text.cc b/text.cc index 0a408d77b..46cfbf6da 100644 --- a/text.cc +++ b/text.cc @@ -23,8 +23,8 @@ #include "defs.h" #include "jeeps/gpsmath.h" #include "src/core/xmltag.h" -#include -#include +#include +#include static gbfile* file_out; static short_handle mkshort_handle; diff --git a/tiger.cc b/tiger.cc index fd60ea570..0ddaecf6c 100644 --- a/tiger.cc +++ b/tiger.cc @@ -22,9 +22,9 @@ #include "defs.h" #include "cet_util.h" #include "csv_util.h" -#include -#include -#include +#include +#include +#include static gbfile* file_in, *file_out; static short_handle mkshort_handle; diff --git a/tmpro.cc b/tmpro.cc index c2ccbca52..5814c6891 100644 --- a/tmpro.cc +++ b/tmpro.cc @@ -35,7 +35,7 @@ #include "defs.h" #include "cet_util.h" #include "csv_util.h" -#include +#include #define MYNAME "TMPro" diff --git a/tomtom.cc b/tomtom.cc index 9638610ea..2491df7f1 100644 --- a/tomtom.cc +++ b/tomtom.cc @@ -39,9 +39,9 @@ #include "defs.h" -#include // sprintf -#include // qsort #include +#include // sprintf +#include // qsort #define MYNAME "TomTom" diff --git a/tpo.cc b/tpo.cc index 5198179c4..89f3f0d7e 100644 --- a/tpo.cc +++ b/tpo.cc @@ -73,11 +73,11 @@ #include "defs.h" #include "jeeps/gpsmath.h" /* for datum conversions */ +#include // Wish we could use c++11... #include -#include -#include +#include +#include #include -#include // Wish we could use c++11... #define MYNAME "TPO" diff --git a/trackfilter.cc b/trackfilter.cc index 9005f8903..6fe2bc836 100644 --- a/trackfilter.cc +++ b/trackfilter.cc @@ -29,8 +29,8 @@ #include #include #include -#include /* for snprintf */ -#include /* for qsort */ +#include /* for snprintf */ +#include /* for qsort */ #if FILTERS_ENABLED || MINIMAL_FILTERS #define MYNAME "trackfilter" diff --git a/transform.cc b/transform.cc index 1fa9b7de5..1796e8e53 100644 --- a/transform.cc +++ b/transform.cc @@ -22,7 +22,7 @@ #include "defs.h" #include "filterdefs.h" -#include +#include #if FILTERS_ENABLED diff --git a/util.cc b/util.cc index ea2083718..67a300ae0 100644 --- a/util.cc +++ b/util.cc @@ -20,18 +20,18 @@ */ #include "defs.h" -#include "src/core/xmltag.h" #include "jeeps/gpsmath.h" +#include "src/core/xmltag.h" -#include -#include -#include -#include -#include -#include -#include // for va_copy -#include #include +#include +#include +#include +#include +#include // for va_copy +#include +#include +#include // First test Apple's clever macro that's really a runtime test so // that our universal binaries work right. diff --git a/v900.cc b/v900.cc index cb1e0bec6..e844f2c10 100644 --- a/v900.cc +++ b/v900.cc @@ -72,9 +72,9 @@ for a little more info, see structures: ******************************************************************************/ #include "defs.h" -#include -#include -#include // atoi +#include +#include +#include // atoi #if _MSC_VER #define __func__ __FUNCTION__ diff --git a/validate.cc b/validate.cc index af7b1225a..c60aa35d8 100644 --- a/validate.cc +++ b/validate.cc @@ -22,7 +22,7 @@ #include "defs.h" #include "filterdefs.h" -#include +#include #if FILTERS_ENABLED #define MYNAME "validate" diff --git a/vcf.cc b/vcf.cc index 4832f8dfa..e31129f0f 100644 --- a/vcf.cc +++ b/vcf.cc @@ -20,9 +20,9 @@ #include "defs.h" #include "jeeps/gpsmath.h" -#include -#include -#include +#include +#include +#include static gbfile* file_out; static short_handle mkshort_handle; diff --git a/vecs.cc b/vecs.cc index 4a7cf6ef1..6ecbe5312 100644 --- a/vecs.cc +++ b/vecs.cc @@ -21,10 +21,10 @@ #include "defs.h" #include "csv_util.h" -#include "inifile.h" #include "gbversion.h" -#include -#include // qsort +#include "inifile.h" +#include +#include // qsort #define MYNAME "vecs.c" diff --git a/vidaone.cc b/vidaone.cc index 87b21978d..e8f4e59cb 100644 --- a/vidaone.cc +++ b/vidaone.cc @@ -32,8 +32,8 @@ struct */ #include "defs.h" -#include -#include +#include +#include #define MYNAME "vidaone" diff --git a/vitosmt.cc b/vitosmt.cc index deea86fb3..32787afab 100644 --- a/vitosmt.cc +++ b/vitosmt.cc @@ -21,8 +21,8 @@ #include "defs.h" #include "grtcirc.h" +#include #include -#include #define MYNAME "vitosmt" diff --git a/vpl.cc b/vpl.cc index 49238f2a1..c84d1c36c 100644 --- a/vpl.cc +++ b/vpl.cc @@ -107,7 +107,7 @@ C - Checksum */ #include "defs.h" -#include /* for sscanf */ +#include /* for sscanf */ #define MYNAME "vpl" diff --git a/waypt.cc b/waypt.cc index 083adc568..c2351a0ff 100644 --- a/waypt.cc +++ b/waypt.cc @@ -21,14 +21,14 @@ #include "defs.h" #include "cet_util.h" -#include "grtcirc.h" #include "garmin_fs.h" +#include "grtcirc.h" #include "session.h" #include "src/core/logging.h" #include #include -#include -#include +#include +#include #if NEWQ QList waypt_list; diff --git a/wbt-200.cc b/wbt-200.cc index b0d8f97ce..fc2cf6995 100644 --- a/wbt-200.cc +++ b/wbt-200.cc @@ -21,8 +21,8 @@ #include "defs.h" #include "gbser.h" #include "grtcirc.h" -#include -#include +#include +#include #define MYNAME "WBT-100/200" #define NL "\x0D\x0A" diff --git a/wfff_xml.cc b/wfff_xml.cc index 2916746e8..8cb2ae3c7 100644 --- a/wfff_xml.cc +++ b/wfff_xml.cc @@ -20,7 +20,7 @@ #include "defs.h" #include "xmlgeneric.h" #include -#include +#include /* argument storage */ static char* aicicon =0; diff --git a/xcsv.cc b/xcsv.cc index 058a3cc97..bec35e171 100644 --- a/xcsv.cc +++ b/xcsv.cc @@ -26,13 +26,13 @@ #include #include -#include "defs.h" #include "csv_util.h" +#include "defs.h" #include "jeeps/gpsmath.h" #include "src/core/file.h" #include "src/core/logging.h" -#include -#include +#include +#include #if CSVFMTS_ENABLED #define MYNAME "XCSV" diff --git a/xmldoc/formats/options/skytraq-bin-gps_utc_offset.xml b/xmldoc/formats/options/skytraq-bin-gps_utc_offset.xml new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/xmldoc/formats/options/skytraq-bin-gps_utc_offset.xml @@ -0,0 +1 @@ + diff --git a/xmlgeneric.cc b/xmlgeneric.cc index ebb1b1cbe..76e6937d6 100644 --- a/xmlgeneric.cc +++ b/xmlgeneric.cc @@ -20,9 +20,9 @@ */ #include "defs.h" -#include "xmlgeneric.h" #include "cet_util.h" #include "src/core/file.h" +#include "xmlgeneric.h" #include #include diff --git a/xmltag.cc b/xmltag.cc index ef71928e7..bd2d5f179 100644 --- a/xmltag.cc +++ b/xmltag.cc @@ -22,9 +22,9 @@ #include "defs.h" #include "cet_util.h" #include "src/core/xmltag.h" -#include -#include -#include +#include +#include +#include static void free_xml_tag(xml_tag* tag) diff --git a/xol.cc b/xol.cc index f9cc0840b..87b47c1e7 100644 --- a/xol.cc +++ b/xol.cc @@ -21,14 +21,14 @@ */ #include "defs.h" -#include "xmlgeneric.h" -#include "jeeps/gpsmath.h" #include "garmin_tables.h" +#include "jeeps/gpsmath.h" #include "src/core/file.h" #include "src/core/xmlstreamwriter.h" +#include "xmlgeneric.h" -#include #include +#include static Waypoint* wpt; static route_head* trk; -- 2.30.2